about dialog: Remove manual icon sizing
authorMatthias Clasen <mclasen@redhat.com>
Mon, 11 Jan 2021 19:38:18 +0000 (14:38 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Mon, 11 Jan 2021 22:46:55 +0000 (17:46 -0500)
We have icon theme code to do that for us.

gtk/gtkaboutdialog.c

index 745b45ea9b88a71590abc6c92e617793c5b1ee69..bff8e76432d119a2953601cb660c99acca8818c7 100644 (file)
@@ -1644,41 +1644,7 @@ gtk_about_dialog_set_logo_icon_name (GtkAboutDialog *about,
   if (gtk_image_get_storage_type (GTK_IMAGE (about->logo_image)) == GTK_IMAGE_PAINTABLE)
     g_object_notify_by_pspec (G_OBJECT (about), props[PROP_LOGO]);
 
-  if (icon_name)
-    {
-      GtkIconTheme *icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (about)));
-      int *sizes = gtk_icon_theme_get_icon_sizes (icon_theme, icon_name);
-      int i, best_size = 0;
-
-      for (i = 0; sizes[i]; i++)
-        {
-          if (sizes[i] >= 128 || sizes[i] == -1)
-            {
-              best_size = 128;
-              break;
-            }
-          else if (sizes[i] >= 96)
-            {
-              best_size = MAX (96, best_size);
-            }
-          else if (sizes[i] >= 64)
-            {
-              best_size = MAX (64, best_size);
-            }
-          else
-            {
-              best_size = MAX (48, best_size);
-            }
-        }
-      g_free (sizes);
-
-      gtk_image_set_from_icon_name (GTK_IMAGE (about->logo_image), icon_name);
-      gtk_image_set_pixel_size (GTK_IMAGE (about->logo_image), best_size);
-    }
-  else
-    {
-      gtk_image_clear (GTK_IMAGE (about->logo_image));
-    }
+  gtk_image_set_from_icon_name (GTK_IMAGE (about->logo_image), icon_name);
 
   g_object_notify_by_pspec (G_OBJECT (about), props[PROP_LOGO_ICON_NAME]);